* lisp/emacs-lisp/gv.el (gv-define-simple-setter): Fix last change.

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 020aa6c13d123c7403ae1d65fb6c53c88bc09cb3..9d67db6495ab728cd854dea4d323b50c99d3652e 100644 (file)
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2012-11-08  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+       * emacs-lisp/gv.el (gv-define-simple-setter): Fix last change
+       (bug#12812).
+
 2012-11-07  Chong Yidong  <cyd@gnu.org>
 
        * minibuf-eldef.el (minibuffer-eldef-shorten-default): Convert to

diff --git a/lisp/emacs-lisp/gv.el b/lisp/emacs-lisp/gv.el
index 145c48c670e09618ba02f7c4abc1acfde4f03b38..38bb6319a038eb5861bc6d45a2e29922c78244f9 100644 (file)
--- a/lisp/emacs-lisp/gv.el
+++ b/lisp/emacs-lisp/gv.el
@@ -220,7 +220,8 @@ so as to preserve the semantics of `setf'."
   `(gv-define-setter ,name (val &rest args)
      ,(if fix-return
           `(macroexp-let2 nil v val
-             (cons ',setter (append args (list v))))
+             (cons ',setter (append args (list v)))
+             v)
         `(cons ',setter (append args (list val))))))
 
 ;;; Typical operations on generalized variables.